From: Kenichi Handa <handa@m17n.org>
Date: Tue, 21 Apr 2009 07:29:48 +0000 (+0000)
Subject: (font_score): Check AVGWIDTH too.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~773
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0eb88d45f235aa7bf0d1ab7ad1619365f161e877;p=emacs.git

(font_score): Check AVGWIDTH too.
---

diff --git a/src/font.c b/src/font.c
index c9f8b3e2d82..95669963c22 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2270,6 +2270,9 @@ font_score (entity, spec_prop)
       if (! NILP (spec_prop[FONT_DPI_INDEX])
 	  && ! EQ (spec_prop[FONT_DPI_INDEX], AREF (entity, FONT_DPI_INDEX)))
 	diff |= 1;
+      if (! NILP (spec_prop[FONT_AVGWIDTH_INDEX])
+	  && ! EQ (spec_prop[FONT_AVGWIDTH_INDEX], AREF (entity, FONT_AVGWIDTH_INDEX)))
+	diff |= 1;
       score |= min (diff, 127) << sort_shift_bits[FONT_SIZE_INDEX];
     }